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

Merged-In: I43fee240a64460056cb0b575504dba0895806dd2
Change-Id: I1eb1812047aaf09e96f10f68e36044d872498a2f