[automerger skipped] Merge "Force remove locking from GCS when device dies during test." am: aed88e2ab2 am: d1a3af4a8e am: 7209542a1b  -s ours am: bbd4aaa349  -s ours
am: f72e0f027c  -s ours

Change-Id: I629a72ac19370a52dacffd96337ee77fa252376e