am e2038151: am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev

* commit 'e2038151c2a3410a67edc408a1d677b05cda41ec':
  Prepare for testing the NetworkControllerImpl