Merge \\"Hide APIs that shouldn\\'t have been public\\" into nyc-mr1-dev am: 8317f93012
am: d34da3b659

Change-Id: I49e9fc1f0f58db9f6200b954b5b639ac263ca8da