am 553e3898: Merge "Improve test key names to reproduce public issue" into jb-dev

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