Merge "[SDC] Fix image name" into honolulu