am 7f09846d: Merge "Clean up access checks."

* commit '7f09846de272369effd62be4c046484f92236c86':
  Clean up access checks.