am 2be38a0f: (-s ours) Merge "DO NOT MERGE: Fix a bug where the sequence numbers would be wrong" into ics-mr1

* commit '2be38a0faf23cd06f36d2be21feb72a30f23ff97':
  DO NOT MERGE: Fix a bug where the sequence numbers would be wrong