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