Harden hidden api checks.
am: 6442eaf8b2

Change-Id: Ib6b09d1c590bc74504d3f02568a1d8218ed18735