Merge "Remove double accounting of builds"