Properly protect cell location.
am: d9cc11475b  -s ours

Change-Id: I1c9337e09f7bd4338a5afbdb7cad2e19904c6af9