Merge "fix(rd1ae): rename legacy MPAM build option" into integration