Merge "Merge "Hide API" into rvc-dev am: 58979d9557 am: b86e26043c am: 322d0f8d40" into rvc-qpr-dev-plus-aosp am: f27ce8cd4f

Change-Id: Ia5a38f8b01c340037b0598fb20638d2b64fd2dc7