Merge "Change lock ordering to prevent violation."