Merge "Update RegState for new CellIdentity types" into pi-dev
am: 432a5c0570

Change-Id: I144dbff46c091494e6b9a7329cd7970e29e431cd