DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I277fea2e29c3e501eefdd231bb935661721c270a
Change-Id: I9de870adde9e98ed02571337a7325f36c74e9983