Merge "Remove NETWORK_STACK_UID check"