Pass same parameters to both scripts

Change-Id: Iff24a6796d7617ede8aa4665bf2678d6fe7686e2
Return to starting directory at end

Change-Id: Id9cf1cabaf6d873a131333c813930c1add95e13b