am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev

* commit '0c305430e8945f8e97ba2ce69fcbb07b903c110a':