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

* commit 'ef845286e0f0af4155599376a628e904f9ac3bd2':
  Prepare for testing the NetworkControllerImpl