Merge "Solve ssh issue using the process.wait()" am: 1780fd7ba7

Change-Id: I9052861436f781174ee76ae38d919273e3368238