Merge "replace hidden Context APIs" am: a8e30ef3fe
am: 71a3431f17

Change-Id: Ib69d616a1b79faceef4346e4594d845240151d63