Merge "Removing taking unrelated locks from holdLock"