am 35c46680: Merge change 3226 into donut

Merge commit '35c46680852268d6b7b51dadf3d5349d146ccdcd'

* commit '35c46680852268d6b7b51dadf3d5349d146ccdcd':
  Update a javadoc comment suggesting the use of a deprecated class.