Merge "Make Uve test cases more reliable Make test_uve and test_vrouter_uve non-flaky Change-Id: I5d68fb78d5901602bc12e80f4bc6371a050f1c17"(cherry picked from commit 458bff59bf19c2856b335453cc424779a76f4517)

Change-Id: I004a7f6c0b04e405083b9c84932abd7477741f91
Merge "Merge "Make Uve test cases more reliable Make test_uve and test_vrouter_uve non-flaky Change-Id: I5d68fb78d5901602bc12e80f4bc6371a050f1c17"(cherry picked from commit 458bff59bf19c2856b335453cc424779a76f4517)" into R1.10