Merge "Added the high usage hidden APIs back" into rvc-dev