Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev