Add javadoc and unhide new API am: f3017f74a0

Original change: undetermined

Change-Id: I1c9dac3eb92ac2c06935a6007de9efbf01ba07db