Merge "Keep close_idle_connections optimization for all devices" into oc-mr1-dev
am: f0b56a65f6

Change-Id: I00d9a4ab6f3ab7929c3f8b397329200b8983e672