Merge \\"Implement extra logic for disabling add call\\" into nyc-mr1-dev am: d99a6bd839
am: 2f929e1bc1

Change-Id: Ibcf14999648b6899faabe7e8fdd8b66761a2b8ff