[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

Change-Id: Id4f47a45bfea84f41b19b1d6e959157440e0e9a2