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

Change-Id: I6e21b1042db7a601190d7e7a0286c49280f79e63