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

Merged-In: Ic1e07d28a41eea2ce59cc21702dae95d61adc24e
Change-Id: Ibc69b3e372167485bb70ae3277222bbe8ef7ff27