Merge "Remove obsolete sync directories for SAC"