Merge "Move the lock operations for cuttlefish instances to a method"