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

Merged-In: If4e844b205ad43a0d6e753148e6eebf06e61d2dc
Change-Id: I1a7891a6cf23e8385f1fe3f0fceec8f8fb753203