scp test timeout

Change-Id: I064567d1a9ce84070007e8fa244d462c15b88ce0
Merge "scp test timeout" into R1.05