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

Change-Id: I51365e12797493e620e3146cc7e25eda8c2065c8