Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev am: ddad5593c2
am: d18e375ece

Change-Id: I107764c21e666f541920f068ebf78ee88269954a