Using cellX and cellY for comparing position when rank is not available

Bug: 22059402
Change-Id: I69ec2b9b68610e171e76cd968de77aaed669672c
2 files changed