cherrypick hasFreeTrial change