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

Change-Id: If4f31815e4c053fef6441f1cf109bbbda0deaaa7