Re-add hidden API am: adfb679ade
am: ed37f9f49d

* commit 'ed37f9f49de2863768e1bcfa649f9f6671d0d354':
  Re-add hidden API

Change-Id: Ic49a4fbec0539d1b9d9a5aa0c9bdcf5b9b902439