Merge "Fix fastboot lock synchronization problems."