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

* commit 'dcc50cb2201e672c3dcd286dc1e29a58be72a751':

Change-Id: I9e71eed47b2549b8befa10837ad39e820b843986