Merge "Added the high usage hidden APIs back" am: 94189968e5

Change-Id: Idc61feb6c500d0a14798cbb6e76a859a221357b1