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
am: 5fea9dfd6c  -s ours

Change-Id: I89416251a8fb7541e3070a44a8167be5423e8944