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

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