DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I7108d245c7b4ed4b6e1c72aeaa2d88dcca78e85f
Change-Id: Ib835c1a54cd5818832bb4ed51128c86a32591ea1