Merge "ref: Change underscore to hypens for identityd flags."