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

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