Re-add hidden API am: adfb679ade am: aa5133d08e
am: e186f6215c

* commit 'e186f6215cc8d01909108172eaa2a27f0a452130':

Change-Id: Id008abb2c6bf9e036a45f0633fa0c6c10a421f74