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

Change-Id: Iebbaece2b1cc09fca3f2ed41738dda0ad895fc72