Revert "Revert "Fix intApp TC failure""