Merge "keymaster: fix authorization set serialization"