Merge "Catch IllegalArgumentException to avoid SyncManager crash" into oc-dev