Merge "Update KeymasterDefs"