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

Change-Id: Ic081252fdc2a9a82a68cee4c568fcd0b95ccd559