explictly use timeout variable

Change-Id: I57937b0582567cd4b2ea976845a38e8ec66bdec6
Merge branch 'master' into staging