am 65fe3ea7: am 5e3b502b: Merge "keep test names consistent with other tests."

* commit '65fe3ea708bf16ebaa354080b90b6e6c83a24e70':
  keep test names consistent with other tests.