Use LESS nested blocks more

Change-Id: I6fc5cdd025bc2c3cd50e13418a162251a79e4c20
Merge "Use LESS nested blocks more"