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

Change-Id: I8e2b8e54f8277f0ee1882045f0b26b45ae00027d