Merge "Add UNINITIALIZED and rename INVALID" am: b8493ac5eb
am: aa20ef0836

Change-Id: I2ad19b617f0165e7bcabac567463dfe8f4b175c6