Re-add hidden API am: adfb679ade am: ed37f9f49d
am: 11cd397eef

* commit '11cd397eef6aeaf68a9a8df0c4bb00e0d59e3033':
  Re-add hidden API

Change-Id: Ifa00b3b50422fb9baa3adf272b56b3e8a8a033c2