Merge "Revert^2 "Revise KeymasterMessage versioning system""