Harden hidden api checks.
am: 3bf5163427

Change-Id: Ia22f4f8f789c5f7419f7b459585f5d970c79110f