Merge "Add NETWORK_FACTORY permission"