Merge "Find goldfish images in subdirectory in SDK repo"