Merge "Better synchronization in call log backup test" into nyc-dev