Merge "Fix CTS proto for Stack level unification (64/n)"