Merge "Enable persistent http connections." into ics-mr1