Merge "Enabling flaky tests per our new flaky test policy" into ub-launcher3-master