Merge "Correctly label the fimg2d device node."