Merge "Remove getNeighboringCell API" am: e164be3176 am: 66c63a4bbe
am: 473c9609a9

Change-Id: I176c4079bb2b487fde37738bf9b4e017b2fd10e9