Merge "Enforce add call logic when placing call." into nyc-mr1-dev am: 95c28c590f
am: 38565b1b95

Change-Id: I44533a7adadc6eabbc221732ca1e70754e78a072