Use backward compatible enum values.
am: 2ab1a10678

Change-Id: Id166d4acfc8e161b6923ed96f7d657b45b48c135