Merge "Fix CallLogProviderTest"