Values of 0 shouldn't have units specified

Change-Id: I2a048ea91c171df559060f2c9f77bbcbf283697a