Merge "DSDA: Cleanup outgoing ECC logic" into main