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

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