Merge "Ensure external calls do not go through call blocking code." into nyc-mr1-dev
am: 1335994507

* commit '1335994507a9dd0780e0c770d1ba6dbe059176c7':
  Ensure external calls do not go through call blocking code.

Change-Id: Ia08ad649b8ca6ca46cbe65c4c4f1d43261439e40