Hide new methods instead of modifying the public API

Change-Id: I8a1b316f70a0dd76eb6c900d9c1a74e8e1765af3
(cherry picked from commit a852ea56574092a2de0714404aacf455300f5f02)