Merge "Use default "ds512M" advance image in older stable branches"