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