Merge "Fix Functest return values"