Merge "Modify log message to avoid logging null String" into ub-contactsdialer-g-dev