Merge "Sleep in between calls to NoMan service in test" into rvc-dev