Merge "Rephrase tog-norollbackdiff"