Merge "Merge "Improve the layout-related comments." into nyc-dev am: 343eb72 am: 1dc396f" into nyc-mr1-dev-plus-aosp
am: 3a6c28f

* commit '3a6c28f1f810d84bfec6e195502717647c174a76':

Change-Id: I89d3dbcf1b6baee2de93cc62d4fe13a94b3bca82