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

Change-Id: I432d41f87018b9fe2b9956df733cb226d75bb0a6