Merge "Reorder lock acquision vs try."