Merge "Adds two missing Keymaster definitions."