Merge \\"Handle failure to pull an external call.\\" into nyc-mr1-dev am: d6ac06bf45
am: aac5fe4f3d

Change-Id: I073758bac11edb6506bb9679221d29b2011dcc40