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