Merge "Notify user switch event to NetworkController" am: 1aa24246cf am: 4ab0e9f824 am: 3f326e7011
am: bddba11564

Change-Id: Ibc3aa5c5c7217cdb67dc31d1f9417df48b55127c