am 5a23b679: Merge change 20447 into donut

Merge commit '5a23b679067cb110345b095ee98f9671a2273461'

* commit '5a23b679067cb110345b095ee98f9671a2273461':
  Fix template for java test file to not use deprecated class.