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

Change-Id: I28a43a5391d8f815029a3f78ef2f45bc67105bb9