Merge "Fix: ConnectivityManager is initialized with a wrong context"
am: 4517eacd5d

Change-Id: I0629b33b8cc5e155b4500cc15901985dbf0a31f2