Merge "Fix ConnectivityServiceTest fail." am: fa8fc65340
am: ccc12f673b

Change-Id: I7f185e731db91c30a9b0f14aefbdbb067942190e