Merge changes Id705d625,Id924fdd2 into main

* changes:
  Fix flaky TestWakeupClientServiceImplUnitTest.
  Fix Vts VUR test case.