Merge "Reduce CONNECTIVITY_CHANGE bcasts" into mnc-dev