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

Change-Id: I7f08086badfddcf9d667a749cf035e36366f9a7c