This reverts commit 6017a8bd. Reason for revert: re-enable FaaS on Flicker tests Change-Id: Ic544c984cbae6c871690859f71315b613a45e26a