Merge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev am: ccf93b2792
am: 04a4425729

Change-Id: I03a6c8ec52a5aa4fd7620d18f7cf75fa115be73b