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

* commit '872d4e00ed1715d76dc8e97853a4e3e9542ca8d0':
  Prepare for testing the NetworkControllerImpl