I am pessimistic about this. The NSA fiasco hurts the interests of many American tech businesses, especially those operating a cloud, but you don't see any signs of US government changing their mind on surveillance. At least in the United States, money can influence politics. Yet the tech companies fail to change anything. In China, the power is inverted: politics control money. If censorship is good for the party but bad for business, then business just have to work with that.