Merge "Remove unnecessary locks."