am bfa62339: Merge "Removing things that shouldn\'t be public" into honeycomb

* commit 'bfa62339ef97c6be6ac904532a115712d669025b':
  Removing things that shouldn't be public