DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: If3b8c3e770aba51b1714790038e89cfba74a23e0
Change-Id: I23175074c6e01e2791c339fe4170ccf845c5a457