Use new version scheme

Change-Id: I88fef778e99230f266cee2e1963387215fee54ce