Merge "goldfish: bump data to 6G"
am: ee837a885e

Change-Id: I5c644d2527bc00e6caa347d116ea01232b9929ec