Catch a few extra users of UserEnvironment.

Change-Id: I3112773b72c329893e4118ef1c4f4087d899139e
3 files changed