Merge "Add UNINITIALIZED and rename INVALID"
am: b8493ac5eb

Change-Id: Idd2ef2a91aab0e28743762ea4860b49a02e8389b