Merge "Key upgrading for FDE."