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

* commit '615fc09cbdb5b598547d5c2e0f9112b1467ac972':