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