am 0c5b96b1: Merge "Use pending.xml to persist sync ops." into klp-dev

* commit '0c5b96b1cd6c0d7523e0653682a146dfbc9ad659':
  Use pending.xml to persist sync ops.