Merge "Fix STOPSHIP in SyncManager" into oc-mr1-dev