Merge "Clean up deprecated DCAE parameters from R2" into beijing