Rework how versioning work.
am: e3cadcacd7

Change-Id: Ie6226589c03a1215c0435aa15692c15ab3cb3f5a