am 04ce8111: Bring in more layout lib changes from hc-mr1.

* commit '04ce81113107d2bfa0b8248b13145b4cf24cb943':
  Bring in more layout lib changes from hc-mr1.