Merge "Disable poor network connection alone" into ics-mr1