am 0e4cccbf: am a8dcc8c8: am fe57f665: Merge "A few more Java7 related clean ups."

* commit '0e4cccbff61dc77e68f0dd13e5c96432febe82bb':
  A few more Java7 related clean ups.