Merge "Use Context#createConfigurationContext()." into nyc-dev