Merge "goldfish: increase data to 6G for xl config"