Merge pull request #2512 from Stackdriver/pri