am f25805e3: am 1d486fb3: am 02d44fe7: Move key name creation to common path

* commit 'f25805e36356cf09dc4853224b24e969ad55651f':
  Move key name creation to common path