Merge "Improve resolver cache lock and thread synchronization"