Fix enum switch warnings am: 248ec3da8b am: 1c74c66219 am: 3a69a4a432
am: 848c07bfcc

Change-Id: I5007217fced0fe323b531e5a8704bac363fcaea8