Merge "Reduce connectivity logging" into ics-factoryrom