am d47761ea: am b01e10c5: There is no @note javadoc tag.

Merge commit 'd47761ea869f3fcaee18c5a25d1d79e4173b84a3'

* commit 'd47761ea869f3fcaee18c5a25d1d79e4173b84a3':
  There is no @note javadoc tag.