am 9e98927e: Merge "Retain configuration change info and sync access." into jb-mr1.1-dev

* commit '9e98927e2dd3e9498753e6878709b2625e96feea':
  Retain configuration change info and sync access.