Simplify CSS loading

Change-Id: I5cac055c254668547ff7d60bfe03de41a58fc33d
Merge "Simplify CSS loading"