Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev