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

* commit '3016064e2cb1c3dbd79413d38beabe88e556c3b6':
  Ensure external calls do not go through call blocking code.

Change-Id: Iea997e8ec6e61e813b7891285761a33908b4da5a