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

* commit 'ea18624ae557a06e49748964f951a81fd6c48370':
  Tweak test for layout.