am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into...
am 0b3718d6: Merge "Add global setting for ephemeral network timeout." into lmp-mr1-dev automerge: cc4f1830
* commit '0b3718d6':
Add global setting for ephemeral network timeout.