Force remove locking from GCS when device dies during test. am: 3f15d657e2 am: 20dee7db6e
am: 73fccace84

Change-Id: I47f9303b0d0da4f9614cdbf94199051b2191a0a5