[automerger skipped] Merge "Passing data RAT for old setup data call API" am:...
[automerger skipped] Merge "Passing data RAT for old setup data call API" am: 4fdf0ec5 am: 9ef4fb10 -s ours
am: b9a46ae6 -s ours
Change-Id: I9598e2e60e24375e6b07713513673719d4def836