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