Merge "Ensure external calls are not logged." into nyc-mr1-dev am: 76912d085a
am: adceb83157

* commit 'adceb8315732e81cdad596e7fd79250cecb07e02':
  Ensure external calls are not logged.

Change-Id: I97c23b980d60fc9b4399bac112c724eb91e35063