Eng 3504 mv partition agg

Jenkins is happy.