Merge "DO NOT MERGE - Merge RQ1A.201205.011" into stage-aosp-master