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

Change-Id: Icbdc9d3156546ceb3b8a0672687479bea77bb032