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

Change-Id: I85fba76d2d7981b421e655f82c23627e555dcd2c