Fix usage of environment section constants

Previously, constants were not being used or were being defined in
multiple places.

Change-Id: Iddd001392b77ac57d858a84daba66553a90465b2
Merge "Fix usage of environment section constants"