Bug 561121: Adapt to enhanced AppEnvironment

Change-Id: I9872c33feaee9289a6cd006e5dc9ae1d06fed051
2 files changed