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

Change-Id: I4f44c0b2b61a422cc23d6dfcae5bc023c9c6f4b0