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

Change-Id: I16fd345f2d786090017e50d936f62e8f76ba2acf