Merge "Add additional mocking for Context innards" am: a65aa77c am: 35182218 am: f22995ee am: 48c3c00e am: 4a1059ca Change-Id: I2695841bfc31280060754132e589af1ca95911da