Fix versioning issues after enabling version tagging jobs

Change-Id: Icf795c141d665a6b2c19550854bf28942e73a4d6
2 files changed