Merge "Add additional mocking for Context innards" am: a65aa77c1c am: 35182218d3
am: f22995eed5

Change-Id: Ibde5e3e048236d32ea3c1ba2c2700bb6a75323e6