Merge "Passing data RAT for old setup data call API" into pi-dev