Merge "Rename max.active.modems to active_modems.max_count" am: 414a71126e am: 6a5a8d74a8

Change-Id: Ib34c296ab404bdabc69823448c16320e80deacd1