Merge "Revert "Improve CallsLogManager logging code."" into udc-d1-dev