Merge "Add raw image support for lxd scenario"