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

* commit '1a1b0f9ed5f5cc908d5011f96181065af4bdf606':
  DO NOT MERGE - Plumb context through for serialization.