DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I3c8eb1291bdf9ad5beb55fc586c43e059a374266
Change-Id: I9fa27f3fe37a1739598044d29b48c3f39ebe1c98