Use backward compatible enum values. am: 2ab1a10678
am: 790e6d6fe0

Change-Id: I19dd652bee2dd14d3326485b936bde664cff9e39