Merge "Revise KeymasterMessage versioning system"