am e5bdd85a: am ea18624a: am c9d0ee5e: Merge "Tweak test for layout." into klp-dev

* commit 'e5bdd85a99839e1d557c924d5396d510151da42e':
  Tweak test for layout.