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

BUG=none
TEST=xmllint --valid --noout serviceproviders.xml
TEST=run unit tests