Merge "Add null check in CallLogManager" into nyc-dev