Merge "Support mounting the odm image"