am e0ea02c2: am 3fcf1c85: Merge "Fix a race condition with respect to clients...
am e0ea02c2: am 3fcf1c85: Merge "Fix a race condition with respect to clients of SyncStorageEngine." into jb-dev
* commit 'e0ea02c2':
Fix a race condition with respect to clients of SyncStorageEngine.