Merge "Do not omit enum_field_value in JSON dumps"
am: 66d95e1ce4

Change-Id: I9bb4c434696897d6d3011bccf67ba0821c98113b