[automerger skipped] Merge "replace hidden Context APIs" am: a8e30ef3fe am: 71a3431f17
am: bed3451d9f -s ours
am skip reason: change_id Ia2e76b41fcf9db459243d1013ae5e24114a87bce with SHA1 17ad26508d is in history

Change-Id: I13679a0e74ae3d567185e4b4b76fb3f2682784ce