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

Change-Id: I7fd70cb014d52ef9d42e1046d3b0cb4590a6312f