Merge "Fix log traces for incoming calls" into nyc-mr1-dev