Adding support for 0 as a named value

Change-Id: Id0edb298b23b1ced86b37a543a9e2f12a7822698