scp test timeout

Change-Id: I891eaab4e76899a64f157ea38a4570090afa22ee
Merge "scp test timeout" into R1.06