Merge "replace hidden Context APIs" am: d363bc08e9
am: 255cd441c2

Change-Id: I277f8d134baa416543ec2fef48b85f57b587ca74