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

Change-Id: I3440e965f8f7edfa86359677e704140f39deb320