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

Change-Id: Iea718a0ca6b82f163447913db98ffe448d982efb