Merge commit '1e31ed013abeb2d15868a57e64e4ce25746595a9' * commit '1e31ed013abeb2d15868a57e64e4ce25746595a9': Gservices settings for controlling URL scraping in GTalk app.
Merge commit '1e31ed013abeb2d15868a57e64e4ce25746595a9' * commit '1e31ed013abeb2d15868a57e64e4ce25746595a9': Gservices settings for controlling URL scraping in GTalk app.