Merge "CellInfo Parceling for Invalid Values" into nyc-dev