Merge "Fix NullPointerException in ConnectivityService" am: fe8af96eba
am: d0e6636019

Change-Id: If0c65bd11f5b76e35f6033fa79a8938f7e47a8e7
tree: 338df8136dbca6d0307d3a3e757817c0a017c92e
  1. core/
  2. services/
  3. tests/