Merge "Revert "Change network management listener to outcome receiver" am: dd88b843c9 am: 8e73ae0adc am: c57c9477d9" into tm-dev