Merge "Support connecting to networks with misconfigured subnet masks." into lmp-mr1-dev