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

Change-Id: Ib8815f010883cdb94fcad2cdfb237de39327b20a