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

Change-Id: I3e9a5533093efe5ecdcc908432ec476f081548f5