Merge "adjust network switching thresholds Bug:18589301" into lmp-mr1-dev