Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on...
Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev am: de08983d
am: 02d22b46
Change-Id: I3c6a95aa878022589c395db16806f43ad4795d52