am 7c220b78: (-s ours) am 10bbadf3: (-s ours) am 1a1b0f9e: (-s ours) Merge "DO NOT MERGE - Plumb context through for serialization."

* commit '7c220b78ca620110965fb77ea3d91c1ea12cb487':
  DO NOT MERGE - Plumb context through for serialization.