am 7a058bff: am cd12f845: am ff248435: Merge "Fix cts test LayoutTests#testSimpleRedLayout()" into lmp-sprout-dev

* commit '7a058bffb1252c3dcb90d9e258de13f7736c44b4':