Merge "ConnectivityManager: Provide API's to include location sensitive info"