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