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

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