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