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

Change-Id: Iaaa659c72a41574508aff113797fd429b7426b3e