Merge "Don't Use NPE for Flow Control in getCellLocation" am: 86f991a7bd
am: 65e63ce0de

Change-Id: I07ca0164d7a11a7754eb71f739fdc6308aa193a1