Merge "Revert "Temporarily disable FaaS on legacy Flicker tests"" into udc-dev