Also cleans up references to Context. BUG: 10241917 Change-Id: Ic0b3d650cd85d656002cbb11b2bc73180ffe1bec