[automerger skipped] Merge "replace hidden Context APIs" am: d363bc08e9 am: 255cd441c2
am: d4afd82f68 -s ours
am skip reason: change_id I1c0e364949aa6b518c126224097774066e089a17 with SHA1 05cba99462 is in history

Change-Id: Ib8278d804c177cd317a4b8f01426b3da519e5fda