Merge changes from topic "presubmit-am-5cb98b83274540c4ab7f7303dcd08e5a" into tm-dev

* changes:
  [automerge] Rename Encoder test names. 2p: 0c1f32bfa2
  Rename Encoder test names.