Merge "fix the issue of empty network selection notification" into pi-dev am: 524a95a441
am: 46f881b5e0

Change-Id: Idbeade42a5e72d23e00b977c39666973d2168199