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