Merge "Don't cache return of getService in Environment" into honeycomb