am ccff82ee: (-s ours) am 0c305430: am 436b6ee3: Merge "Catch a few extra users of UserEnvironment." into klp-dev
* commit 'ccff82ee2f3d44088c4e7dd1de7e11de4150b63a':
This commit is contained in: