Merge "Add docs for new padding/margin attributes." into oc-dev am: 8cdbd6e184
am: 1040b18dc3

Change-Id: I8add96e5d8817413500e7763afb77715be3ca703