Merge "Apply admin restriction when network reset is disallowed" into oc-dev