Merge "Don't insert certain numbers into the call log" into pi-dev