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

Merged-In: Ia4b2aa4f28581b2f8ec8885e41e45b4dfee419b9
Change-Id: I15881b2a9184b00fc065416e6f9c1217dfa01e56