Merge "Don't pass calling contexts into static services." into nyc-dev