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

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