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

* commit '24ea88a986cfb6de7197b213ad933a6eb6f0e285':
  Validate objects are from the correct context.