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

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