am deae8e9b: Fixing default layout per spec.

* commit 'deae8e9b12e35d472741ced79098cd10cba5b4f7':
  Fixing default layout per spec.