Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev