am f75e4ca3: Merge "Make it harder to leak contexts"

* commit 'f75e4ca3945f4c299dc26f4c95d8d18ec74f41bb':
  Make it harder to leak contexts