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

Change-Id: Icda0c6495682077725849f96855421f395cd8ff5