Merge "Rename ApexContext to ApexEnvironment." into rvc-dev am: e6dbe2b880

Change-Id: Id9e747701e0fa9c1b2bee5fac14b289d465c8efc