Merge "Add additional mocking for Context innards" into oc-dr1-dev am: cdb134c012 -s ours
am: 9f409ae862 -s ours
Change-Id: I32aee4d72cd8ee471498e5d04a180d0dafc03332
This commit is contained in: