Merge pull request #2885 from Stackdriver/plugins