Merge "[JS01]Remove hidden API usage of Connectivity Sevice" into sc-dev