Fixed issue with elevated contexts modifying the original context

Change-Id: I2c460b6074026bc95070ada4378e2f24d229510b
Merge "Fixed issue with elevated contexts modifying the original context"