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

* commit 'e264d6439d1de2cb6ff80f70213e402174bc61e5':