Rework how versioning work. am: e3cadcacd7
am: a467bedf7e

Change-Id: Icaf914c19e0aa6a45b60f380c8dc6471af719453