Minor stylistic fixes to make use of LESS features

Change-Id: I1445658e53810bb11244e6c1df2689ab2ca6e045
Merge "Minor stylistic fixes to make use of LESS features"