am fb64fe1b: am 4faeef37: (-s ours) Merge "Improve test key names to reproduce public issue"

* commit 'fb64fe1b6ed02f9e52694029f1efe47665353d48':
  Improve test key names to reproduce public issue