DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I1881b39068adf75f53e9fe46123f305026395007
Change-Id: If519752201f61bb36d8a96620d07327b3f6f8f02