Merge "Correct the flag in NetworkController." into sc-dev