Merge "DO NOT MERGE resolve merge conflicts of 3604fffb to rvc-dev-plus-aosp" into rvc-dev-plus-aosp am: 6b6d2390 Change-Id: I9fdab921672a2ecd1a6f00c53ab8b4df104f9b6b