Merge "Notif manager and captive portal app to read SSID again" into pi-dev
am: 249b1a34c3

Change-Id: I663a59ff2847a9f44ea1395326f6cb00e97237b6