Merge "Improve Range Checks on CellIdentity Classes"
am: 7b2d8029ca

Change-Id: Id13a1cfa3be8b303da238eb816f843c01ee6008d