am 750598f8: (-s ours) am 886e7a63: Merge "Change default cellular activity timeout to 10" into mnc-dev

* commit '750598f89e1a313c2bbea6ee4c87780891e0108a':