am 9e86baf7: (-s ours) Merge "DO NOT MERGE Revert 4 CLs that updated the message headers." into ub-gmail-ur12-dev

* commit '9e86baf73cb208f39312eca73b656f35a39bea18':
  DO NOT MERGE Revert 4 CLs that updated the message headers.