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

Merged-In: I5df4acb5fe340476b80a9e4f4c3f1f2db2d0f07d
Change-Id: Icf473f736e0118a6401d92fa605235cd583a8714