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

* commit '56df15d3b41e6599e174da92352d85d11f9155ee':
  Change default cellular activity timeout to 10