Merge "Revert "Revise KeymasterMessage versioning system""