am 3170650a: am 56df15d3: am 5b3a38e0: am bda9b324: am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '3170650a2b611f175e401634436c650a56d957e9':
  Change default cellular activity timeout to 10