Merge "goldfish: update to 331578d04"