Merge "Improved CtsAutoFillServiceTestCases flakiness:" into oc-dev