Merge "Change KeyMint KeyCharacteristics"