Merge "DMaaP MR changes for ElAlto early drop"