Merge "replace hidden Context APIs"
am: a8e30ef3fe

Change-Id: I02b443d64f0f70b5c3b17e0a63687ba466ee4430