Merge "Hide APIs introduced in earlier commit" into rvc-dev am: 97363dce am: 7f463189 am: d7075b80 Change-Id: I1efe4c8d714e9b4bcb5bb9cda3fccba628b274c0