Hide APIs that shouldn't have been public

Change-Id: I40f1c8e9c6fe991e782bf3dd772f305df641b267
4 files changed