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

Change-Id: I74c917d171f169218feb0b512ba58bb9f7cdedbc