Merge "Enforce add call logic when placing call." into nyc-mr1-dev