Merge changes I0fd0efd3,I7ba1fba5

* changes:
  Move ServerSocket annotation to correct dir
  Explicitly hide inner class