Merge "Fix mistake in java doc" into nyc-dev am: 4f1b8d9ee4 am: dcc50cb220
am: 8cb474532c

* commit '8cb474532cb920dc4dd15d0e9b09b73828915795':

Change-Id: I53bd18e35367c3f866236e99b43ba693719718d7