Merge "Add a couple scripts to fixup version scripts." am: 87d9b0a9fa
am: 647196d771

Change-Id: I0f4cf0604c049c9e126797543e04a72d2448ec4b