am 9a9916b5: am 2383f220: Merge "Validate objects are from the correct context."

* commit '9a9916b58fb22da735d18a03beffb24b4d5cd9a3':
  Validate objects are from the correct context.