[automerger skipped] Merge "Add UNINITIALIZED and rename INVALID" am: b8493ac5eb am: aa20ef0836
am:7a39287ca0-s ours am skip reason: change_id Ia2315d9b38ef35b30d9b96b6436c08fa4404e4df with SHA1cb47d1dcc7is in history Change-Id: I9e8250e2bdb4a7f5ce46f43ab25281c62c37e911
This commit is contained in: