Merge "Change default cellular activity timeout to 10" into mnc-dev