Merge "Needed for v.io/c/12823"