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

Change-Id: I9a05f34035a15b233a44d517f2b2426481679974