Merge "internal support lib classes shouldn\'t be public" into nyc-dev am: 9d513bd477 am: b35e25222c
am: 05cee35ee4

* commit '05cee35ee4ecff6fd0b180db5a8c113f8d44b475':
  internal support lib classes shouldn't be public

Change-Id: I39da7fedb152e36c04616bd3104df04fbc8c5979