Merge "Add a --create mode to fixup_version_script.py." am: fdb88fe0d1
am: b281389fc1

Change-Id: I4a5eff445981e71585f439aaf66c90476104910e