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

* commit '1dc396f8f4bcadca3c39ea9f4025d669564f171b':
  Improve the layout-related comments.

Change-Id: I900676d63fdb55957de1d6a798c1530f2d2e0f12