Merge "Redact SyncService stuff from master"