Merge "[CDM] Check for system calling UID when backing up and restoring data" into main