Fix enum switch warnings am: 248ec3da8b
am: 1c74c66219

Change-Id: Ieb23d7bea30c79b65710ca7a6c9e262c8fad05a2