Make the enums signed int, remove unused info. am: 5ea3ece7ca
am: a425770f07

Change-Id: Ibafafe4377ab743a0915508de928571c75b79fe8