Merge "Prepare T build rules for backwards compatibility"