Merge "check admin restriction before enabling network" into tm-dev