Merge "Enforce tag types in KeymasterArgument classes"