Merge remote-tracking branch 'upstream/master' into 'cros/master'.

Conflicts:
	serviceproviders.2.dtd
	serviceproviders.xml

Change-Id: Id3d34b8118e1f46c86d0d6771bf0bd17bc917c72