Merge "Verizon Network Modes" into lmp-mr1-dev