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

Change-Id: Ia29eed8fa490ca90d8940dd70037a49ebffe2c86