Merge "Support kernel modules in the odm image"