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

Change-Id: I2b37262d572301d3b962033b9fe5dfced58a7757