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

Change-Id: Icce3d2887ee5d384bde183cd66460386da14486f