Merge "ART: Relayout Region" am: d94a00cdf0
am: 74da3eeca8

Change-Id: If3cd6618d57996a2b9f47196ce0a1afc9d2bd08a