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

* commit 'c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952':
  Tweak test for layout.