DO NOT MERGE - Merge RQ1A.201205.011

Bug: 172690556
Merged-In: I314e4c3d46a8ef09ce3864da4cecdee58ee96ad7
Change-Id: I6e3217d7ae98934ee7d78cdea79e5e3d6776b815