am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other...
am 585b53e6: am 0325a858: Merge "[Settings] Wifi Setup responds to other connection state change" into lmp-mr1-dev
automerge: 591a0913
* commit '591a0913':
[Settings] Wifi Setup responds to other connection state change