Properly protect cell location. am: d9cc11475b  -s ours am: 9d37f24ee9
am: 05b83493bf

Change-Id: If418a0cde58979c2b024c21ed17ddb01018b4c18