Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184 am: d73f6a985d
am: 95e6c38eb0

Change-Id: Id397296039d2ca9bd8fe6bf4130a3308296843da