Merge "[Tiger] Re-adding PlatinumTest annotation" into main