Merge "Fix typos in reclass for image_layout backends"