[automerger skipped] Merge "Improve Range Checks on CellIdentity Classes" into qt-dev
am: 29ddcbf1 -s ours
am skip reason: change_id I0d3699823be60722a1b741efd60b56f23bbc3e86 with SHA1 251d0a9a is in history
Change-Id: Icf93fce7d45e45472db90b5536f13f76bf6428c2