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

Merged-In: I5601291a449bd0fe22723a84c82cda8aead0d8dd
Change-Id: I89d747000717f420f73744dcbde9171dac4dd88a