DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I025c0d96e77b7355baddac935779c6b27f3042e3
Change-Id: I22fee72738abe8efa77c138e1f85d6c08e8310d5