DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I0ff4edd0b0b0781ce7279e7ac1e44d2702978bca
Change-Id: I913ff04a6c4568c0326866fd4462fb25f4eb317b