Merge change 20447 into donut

* changes:
  Fix template for java test file to not use deprecated class.