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

Change-Id: Ifc73574d837e365d6012752bb3ab11e5d889d0ed