Merge "add UNKNOWN to proto enum"