Fix keyname generation issue am: 392c4dbdc1
am: b8bb4463e0  -s ours

Change-Id: I20283d6cc9576af54b0bfc9e2adaf0e1bfabcee7