git commit -m 'partial revert: Cleanup: Don't use getApplicationContext() where not needed.'

Change-Id: I957eecd02607c320fa28112072b2913c303985e6