Merge "Always specify underlying enum type."
am: 832f1a7978

Change-Id: Iaf8887dcea15c498b3fc2530d349cdff6c1d51d6