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

Merged-In: I990dc6ba5b4a34dbbe1da5fe90422bfc10249c84
Change-Id: Ied8756e93198621051f234ec485e092ad66183a1