Remove duplicated enumerations. am: 2616d5c93d am: 806d982c1d
am: 7909baf135

Change-Id: Iaefe8b1bc45a419147ecf29aa95399d9082cba76