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

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