Bug 561121: Adapt to enhanced AppEnvironment

Change-Id: If53dd578f5daa1285f314e515a8e4493cf9e597d
22 files changed