am fee0ac60: Cleanup and fix method visibility.

* commit 'fee0ac60b1cd0a4760ca8f310ff8a86b925d833b':
  Cleanup and fix method visibility.