Properly protect cell location.
am: d9cc11475b  -s ours

Change-Id: Ia007d1fa298c188a8c49a9c7027b944c67cfcf14