Merge "Set time delay in the vts test setup am: d4c4a4edfb  -s ours am: 633778a470  -s ours" into oc-mr1-dev
am: 7aa6eeac2b  -s ours

Change-Id: I0649593a6a08df77cdb4fd2ccdc4e0d3433064a6