Null enums

Change-Id: I03d530effcbd2779ec8c30e507bc2aa92b06fc86