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

Change-Id: Ie4e338759eb5e926297aa2691161dbf7fe16199c