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

Change-Id: I302419d7e1c2a420db791c446985825a646a4d40