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

Change-Id: I1a0c3f4f0b8936dc019f7faef3d69df6d5e86afb