Merge "Fix keymaster message fuzzing"