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

Change-Id: I5266cf918eb77cf9330e936257f5c9e9fb356030