Merge "add version support to TF. b/6800372"