Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev am: 6c85dbaea2
am: ae7d423c74

Change-Id: If846d21a52c35a67db443e6edee2074d28791386