Merge changes in preview Ops to master

Taking the changes in preview around change in container name and agg stats to master.