am 1ddcfe84: am 47530108: am 728fc731: (-s ours) am c43506fc: am 8c674fda: Fix layout mirroring. [DO NOT MERGE]

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