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

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