DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: Ice1edd7c5320f4d1d915643e30430919de258dbc
Change-Id: Ieaedbe45a0a7bae6579eb1f40bf497889ada405f