Merge "Do not close idle connections by default" into oc-mr1-dev am: 6f8afdc501
am: eb952ab3d0

Change-Id: I5b4583fc8d663afe87cdc79b32536e85a29756cd