Merge change 3226 into donut

* changes:
  Update a javadoc comment suggesting the use of a deprecated class.