Merge "Fix naming of key"
am: 0b74a1dabb

Change-Id: I8eaaee259d96c2c2da70828cd882a86ae6bde8f1