Re-add hidden API am: adfb679ade
am: aa5133d08e

* commit 'aa5133d08e2d96440c3fc116f52f4c1db5acd28c':

Change-Id: Ie9b2835c5421058ac44df5f82ab2bbd4c1748fe9