Changes to make --save-location standard for all commands Change-Id: I86a2da01ad1cc1c4d708131b5161182e16b5bb5e