Merge "Add additional mocking for Context innards" into oc-dr1-dev
am: cdb134c012  -s ours

Change-Id: I6715134fe1883dc2d4613b38478d60f0ad2c33fe