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

Change-Id: I2dd958aa9f8d97ab4f476ad50afed3f884c189d9