Properly protect cell location. am: d9cc11475b  -s ours
am: 793ae278b1

Change-Id: I7b1160872aa39a82dd52fe658700816da840e7a0