Trying to fix otapackage build