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

Merged-In: Ibd34bdd03ff2846d7b66e6621698e09f0d50b5a6
Change-Id: I7586066a4ab5ce5fdef80603b7fce3d297c3f25e