Hygiene: Merge @contentMarginLeft/Right into @contentMargin

Change-Id: I46e67bf9fc0a83692ca957a359d336c99db7c774
Merge "Hygiene: Merge @contentMarginLeft/Right into @contentMargin"