Merge "Key upgrading for FDE." am: 997e605563
am: 2b1b72d183

Change-Id: I3c88a78565751c17f49c712d6015aad02cfca8f8