Merge "Added the high usage hidden APIs back" into rvc-dev am: 899b5ea52a

Change-Id: I5aedb7ff988f844b251aa1d64f52406eba21181e