DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I83e89056be52b96760d95f5826c2bfdcfd3962e2
Change-Id: I345273990b9c456d5264ba7b79256f8a52392399