Merge "move framework metrics over to new proto"