am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

* commit 'c43506fc2dbe3fea6885e74ac8c67b91a0a644ff':
  Fix layout mirroring. [DO NOT MERGE]