Merge "Support backward compatibility for restricted network permission"