Merge "Hide APIs introduced in earlier change" into rvc-dev