Merge rvc-release RP1A.201105.002 to stage-aosp-master - DO NOT MERGE

Merged-In: I1653a75056ff6d5fedb1c23cd19cd36e16220a83
Change-Id: Ie38b170bef708e2b0aa3f5cc2082e5fc9523afdb