Merge "Fix naming of key" am: 0b74a1dabb am: c68c2f6885 am: 1d67d022fb
am: 11765b3fcc  -s ours

Change-Id: Ica15c50f4cc0ec0905cf0f573bdcf0c3b032da68