Merge pull request #2907 from Stackdriver/pkg-fix