Merge "[CDM perm sync] End to end test fixes"