Make it harder to leak contexts

Change-Id: Ied60b6428bedb200d7b5b627e8196fbf2b4151e1
1 file changed