Merge "replace hidden Context APIs"
am: d363bc08e9

Change-Id: I22caa30c96fc7bc64c99d73d5697f63a597de32d