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

Change-Id: I0d82ace7d340af8f66a6233ce5b474d26595c38f