Merge "Remove getNeighboringCell API"
am: e164be3176

Change-Id: If1fb597b4d1058359fd1ecebc4f3dec8691fc6d5